From 06c7e112ed431f8752937ad74e7316746e87629d Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Wed, 23 Jul 2008 20:42:02 -0700 Subject: [PATCH] Look for NEWS in order to find /etc, rather than GNU. --- debian/changelog | 8 +++-- debian/patches/look-for-news-to-find-etc.diff | 33 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 debian/patches/look-for-news-to-find-etc.diff diff --git a/debian/changelog b/debian/changelog index f5965479d89..c597f54a03c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -emacs22 (22.2+2-3) unstable; urgency=low +emacs22 (22.2+2-3) unstable; urgency=medium * Fix an insecurity related to fast-lock-cache-directories (CVE-2008-2142). Thanks to Provided-by: Sven Joachim @@ -13,7 +13,11 @@ emacs22 (22.2+2-3) unstable; urgency=low function. Thanks to Jun Inoue . (closes: #488427) - -- Rob Browning Wed, 23 Jul 2008 19:58:11 -0700 + * Don't look for GNU to find etc/. Look for NEWS instead. Thanks to + "Bernhard Michler" for the report and Sven Joachim + for the fix. (closes: #478240) + + -- Rob Browning Wed, 23 Jul 2008 20:32:25 -0700 emacs22 (22.2+2-2) unstable; urgency=medium diff --git a/debian/patches/look-for-news-to-find-etc.diff b/debian/patches/look-for-news-to-find-etc.diff new file mode 100644 index 00000000000..0de8cefdc5b --- /dev/null +++ b/debian/patches/look-for-news-to-find-etc.diff @@ -0,0 +1,33 @@ +* Emacs will now look for NEWS in order to find etc/ rather than GNU. + Patch: look-for-news-to-find-etc.diff + Provided-by: Sven Joachim + Originally-reported-by: Bernhard Michler + Date: Mon, 28 Apr 2008 11:20:23 +0200 + Added-by: Rob Browning + Status: Debian specific + + Since Debian doesn't include GNU in the Debian packages (the common + licenses are in /usr/share/common-licenses), Emacs will now look for + NEWS to find the etc directory instead of GNU. + +Index: sid/src/callproc.c +=================================================================== +--- sid.orig/src/callproc.c ++++ sid/src/callproc.c +@@ -1587,14 +1587,14 @@ + + srcdir = Fexpand_file_name (build_string ("../src/"), + build_string (PATH_DUMPLOADSEARCH)); +- tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory); ++ tem = Fexpand_file_name (build_string ("NEWS"), Vdata_directory); + tem1 = Ffile_exists_p (tem); + if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1)) + { + Lisp_Object newdir; + newdir = Fexpand_file_name (build_string ("../etc/"), + build_string (PATH_DUMPLOADSEARCH)); +- tem = Fexpand_file_name (build_string ("GNU"), newdir); ++ tem = Fexpand_file_name (build_string ("NEWS"), newdir); + tem1 = Ffile_exists_p (tem); + if (!NILP (tem1)) + Vdata_directory = newdir; diff --git a/debian/patches/series b/debian/patches/series index 1328680dca6..5b7c5e77b6a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,4 +10,5 @@ version-mention-debian.diff fix-vcdiff-tmp-file-handling-cve-2008-1694.diff make-fast-lock-cache-directories-risky-cve-2008-2142.diff fix-mule-select-safe-coding.diff +look-for-news-to-find-etc.diff autofiles.diff -- 2.30.2